From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 22 Jun 2011 16:30:01 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2379^2~35
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2d7e212b68d18ba8cb907f5ea43df6e201e57f8e;p=emacs.git

Merge from trunk.
---

2d7e212b68d18ba8cb907f5ea43df6e201e57f8e